From 58e5a0227dd82d6e009c8950c309ee4db0e8a998 Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild.aw" Date: Fri, 9 Jun 2006 10:35:40 -0600 Subject: [PATCH] [IA64] use get_gpfn_from_mfn() clean up vmx_vcpu_tpa() and mfn_to_gmfn(). don't access mpt_table directly. use get_gpfn_from_mfn() Signed-off-by: Isaku Yamahata --- xen/arch/ia64/vmx/vmmu.c | 2 +- xen/include/asm-ia64/mm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/ia64/vmx/vmmu.c b/xen/arch/ia64/vmx/vmmu.c index 49b289707c..84db1441a1 100644 --- a/xen/arch/ia64/vmx/vmmu.c +++ b/xen/arch/ia64/vmx/vmmu.c @@ -637,7 +637,7 @@ IA64FAULT vmx_vcpu_tpa(VCPU *vcpu, UINT64 vadr, UINT64 *padr) dnat_page_consumption(vcpu, vadr); return IA64_FAULT; }else{ - *padr = ((*(mpt_table+arch_to_xen_ppn(data->ppn)))<ppn)) << PAGE_SHIFT) | (vadr & (PAGE_SIZE - 1)); return IA64_NO_FAULT; } } diff --git a/xen/include/asm-ia64/mm.h b/xen/include/asm-ia64/mm.h index 2521b5c144..a284079244 100644 --- a/xen/include/asm-ia64/mm.h +++ b/xen/include/asm-ia64/mm.h @@ -460,7 +460,7 @@ extern u64 translate_domain_pte(u64 pteval, u64 address, u64 itir__, u64* logps) */ #define mfn_to_gmfn(_d, mfn) \ - machine_to_phys_mapping[(mfn)] + get_gpfn_from_mfn(mfn) #define gmfn_to_mfn(_d, gpfn) \ gmfn_to_mfn_foreign((_d), (gpfn)) -- 2.30.2